JSS15K

Matching 1d96695b113c9a2144743ce45e65eb53828f90ec

Change-Id: I2afd65f6277a914ab8f998be0202c5c4bf7b9539
Snapshot at SHA1 71dcbc3b13884ce144b2adc749528ae37257158c
Merge tag 'android-4.3_r3' into HEAD

Android 4.3 release 3.0