Merge tag 'android-4.3_r3.1'

Android 4.3 Release 3.1

Change-Id: I0895942fc43de1c8ed6411771242088ef36df47a