Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_arrays.xml

Change-Id: I1e366b63235939553256dae06258cc4ed6c78ba6
Merge derp - missing tag

Change-Id: Id3196f38454b62c963b88bb8ef8fb55ed0b66283