Import CM build additions

Change-Id: Id1eb902129754e61dfcc2b5d95c3a75172ff0c5e
12 files changed