Merge tag 'Android-5.3_r2.2' into jellybean-mr2

Android 4.3 release 2.2