crDroid'fy our build

Change-Id: I6a6252921823fcceecb23891ac5bb94eca5607f6