Merge https://github.com/OpenSEMC/android_device_sony_fuji-common into HEAD