fix msm8960 and msm8916 builds
am: b1b07992bc

Change-Id: Ic3374976357ce30735c7a247acd981397665de8d