merge android-4.3_r2.2 into jb4.3

Change-Id: I5aff7bb602ba28b6a20113bdb5dee99db7fa951a
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values-cs/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-it/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values/strings.xml