fix merge
Revert "Runtime enablement of WebGL"

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

Change-Id: Ib6c013ab3e01204281139fd20f9752c3025ec482

Conflicts:

	src/com/android/browser/BrowserSettings.java
Fix build warnings.

Change-Id: I20117cf287ca25387c8664de2096c00ef63ec1e5