Merge with latest changes from https://github.com/AOKP/platform_manifest