Prepare for unified moto_msm8960 build

Change-Id: I2d820913d216378c837a06af5ab477b021ccc341