Fix Build Error
Merge branch 'jellybean' of https://github.com/ThinkingBridge/platform_frameworks_base into jellybean