Merge "Fix oatdump for no image"