Merge "Revert "Enable patchoat to write image relocation files""