More mods for AX build

Change-Id: Icc9318bae4a8dcc4cae1a477f6d097f74a7e565c
Added overlay for CM torch

Change-Id: I7154dec3901bc9b7ca618917d18a8fdeab51d274