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

Android 4.3 Release 3.1

Change-Id: I8ff13127f00e27ee87438a457e94da1fcaebee9f