Track CMs dalvik

Attempt to fix build errors