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

Change-Id: I473d7c32b9590d79a261c06b9616270737f58a8a