Merge tag 'android-4.3_r3.1' into HEAD

Android 4.3 Release 3.1

Change-Id: I45ace0b8a13811ad6555c24ee8ffe27251e04c61