framework : fix build error
Merge branch 'cm-10.1' of https://github.com/neo4026/android_frameworks_base into cm-10.1