Squash 4.3 changes.

rebase

Conflicts:
	res/values-ar/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-it/strings.xml
	res/values-lt/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-sw/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	src/com/android/browser/BrowserSettings.java

Change-Id: Iad83269479b4f74473cc4ba5531cfc5e25133329