m7-common: Enable Advanced Settings and l2m mappingg

** Comment out CMHW

Change-Id: I26eca82b4b6e7070851e5dfaae08007f315e0536