Fix the build on non-QCOM

Change-Id: Idb8d5c98fbdc01e6063ad0eb224baba66acc813d
Merge remote branch 'cm/cm-10.1'