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

Conflicts:
	Android.mk

Change-Id: I6d2e79242f95f46e686489a33315af8d7118988a