Fix up includes
Merge branch 'cm-10.1' of github.com:androidarmv6/android_device_huawei_u8150 into cm-10.1