Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

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

Change-Id: I589dffdd88604f4630ccf9ddb8848ddbdfa66a65