merget from https://github.com/OpenSEMC/android_kernel_sony_msm8x60.git