Merge https://github.com/DirtyUnicorns-KitKat/frameworks_base into HEAD