Merge "Fix oatdump_test."