crDroid'fy hammerhead

Change-Id: If665f99c97dfe5aae02426d77c87d1196ed24e35