Track CM repo
Merge branch 'jb-mr1' of github.com:AndroidDynasty/platform_manifest into jb-mr1