Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	d710.mk

Change-Id: I259c012b3e35b2a40f6afbb645e89eca1ef63545
Merge branch 'mokee' into HEAD
Merge remote-tracking branch 'cm/cm-11.0' into HEAD