Merge tag 'android-4.3_r2.1' into jellybean-mr2

Android 4.3 release 2.1

Change-Id: I7ea98025f0e1b6d75c02ca69293bdd9d4702bbae