tracks samsung jf stuff
Merge branch 'jb-devel-release' of https://github.com/codefireXperiment/android_manifest into jb-devel-release