Clean up
Merge branch 'kitkat' of https://github.com/IOAP/platform_manifest into kitkat