'Merge kitkat branch from "https://github.com/AOKP/frameworks_base" into kitkat'