Merge "Fix oatdump tests on target."