Reconcile device-common.mk and BoardConfigCommon.mk with CM

Change-Id: I7b622839cd2865341c88ba4d226d5f03a9fed3d2