Build error fixes
Merge branch 'jellybean' of https://github.com/XYAOSP/frameworks_base into jellybean