merge CM build changes

Change-Id: I5344576d7ab362b5cb2ebbf24367f7a8cc7d6e45