fix some build problem for halo
Merge branch 'cm-10.1' of https://github.com/mnemonyc/android_frameworks_base into cm-10.1