Merge tag 'android-4.2.1_r1.1' into jb-mr1

Android 4.2.1 release 1.1

Conflicts:
	default.xml

Change-Id: I0c71afa9b83eeda357aa1721bb254a64445aad48
Merge tag 'android-4.2.1_r1.2' into jb-mr1

Android 4.2.1 release 1.2

Conflicts:
	default.xml

Change-Id: I5760155b32ad2486677bf281d529954e2ea25f57