bring msm8960-common up to speed with CM

Change-Id: Ic29ca4d9d361303c4d3affbf0ef47604a5fa9198