Track dalvik from CM again