Merge branch 'cm' into HEAD

Conflicts:
	BoardConfigCommon.mk

Change-Id: Ic9169e1d9efbdaa12a3b8ce2bc2d0b4cf993159f
Signed-off-by: DHOMD <DHO@dho.im>