fix dalvik (and broken commit)