Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Conflicts:
	res/values/colors.xml

Signed-off-by: travp624 <travp624@gmail.com>