Merge tag 'android-4.3.1_r1' into HEAD

Android 4.3.1 Release 1

Change-Id: I2331bc7a68904e3f1dde12b33da3bdc937e0220f