switch to cm dalvik

Change-Id: I9224495d62f954b2cfa4690d266b5f9175692c92