Build fix
Merge branch 'kitkat' of https://github.com/CRXTeam/android_frameworks_base into kitkat