CRDROID now and not CM

Change-Id: I6af68c3d1d84b3050ce45dd1a7e2070c6b2b532b