Revert "Merge branch 'kitkat' of github.com:espmartin/platform_manifest into kitkat"

This reverts commit 8d0600664499349c72dc5e775db5dcee86b4fcd7, reversing
changes made to 2be490cb72e24f29849ea513e5c9f086852b98b0.