Merge remote-tracking branch 'aosp/kitkat-mr1.1-release' into HEAD

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

Conflicts:
	java/res/values/colors.xml

Change-Id: I649e7c98e6299fb5edf4b3c53fb265c83937d176