Merge remote-tracking branch 'aospa/kitkat' into kitkat

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml

Change-Id: I32458ba0c0b1547f4fdea9ad5dded33c272aad9b