Merge android-4.2.2_r1

Conflicts:
	res/values-es/strings.xml
	res/values-tr/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml