Merge "defconfig: msm8960: sync up perf defconfig" into msm-3.0