Merge "Remove unused PATCHOAT_FOR_RELOCATION."
am: 6724797d15

Change-Id: Ic616ff0fb8c9fc6579669f9e01b2f8a8b7499de1