Merge "defconfig: syncup msm8960-perf_defconfig" into msm-3.0