Misc updates
Merge branch 'jellybean3' of github.com:Ryuinferno/platform_manifest into jellybean3