initial merge of 9.1.A.0.490
Merge branch 'master' of https://github.com/NuriJ/sony_kernel_msm8960

initial merge of 9.1.A.0.490