Merged https://github.com/lollipop-og/kernel_msm 2