Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev