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
Revert "Runtime enablement of WebGL"

 * No longer applicable- WebGL is on if compiled in.

Change-Id: Ib6c013ab3e01204281139fd20f9752c3025ec482
Merge remote-tracking branch 'cm/cm-10.2' into sm-jb-mr2

Signed-off-by: Paul Beeler <sparksco@gmail.com>

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