Enable Ambient display

Change-Id: I109f0cbf0bee475d8d2f573668b6771cc61d9ade
Move a few things to cm.mk

Change-Id: Ifa4e6fee9796e7d8ee20bb90f8a7618206f55dc2