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

Android 4.3 Release 3.1

Change-Id: Ic24912acba22fd11335c8f8c69274d2b7b21fa82