Merge "Fix oatdump_image_test."