Merge "Fix oatdumpd."