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

Android 4.3 release 2.1

Conflicts:
	src/com/android/browser/BrowserSettings.java

Change-Id: If8fd8797a1a86d7bab09826cc8a97cc58255de9b
Merge remote-tracking branch 'aokp/jb-mr2' into jb-mr2