Merge branch 'remote' into mkl

Conflicts:
	BoardConfigCommon.mk

Change-Id: I99e5c9c30f7a2a79db952a41a79ed85c6d2100ae