Fix you want to build cm,.. you can now

Change-Id: Ie18156ae5b7917f65e259e4c5b63be62ee848127