fix dalvik merge