Merge "Remove obsolete and unused PATCHOAT_FOR_RELOCATION."
am: 804b145356

Change-Id: I0c9a38e9be249bcb81f7b04b436a00d60b779fc5