fuji: cleanup includes for 4.2 and new HALs
Merge branch 'cm-10.1' of github.com:OpenSEMC/android_device_sony_fuji-common into cm-10.1