track local qcom keymaster
Merge branch 'jb-devel-mr2-release' of github.com:codefireXperiment/android_manifest into jb-devel-mr2-release