fixes for msm8960 builds

Change-Id: I8a69bc8676455050dfcdd1b8c3464f9a2aecc8cd