Merge "Oatdump fix."