Merge "ARM/ARM64: Clean up relative patchers."
am: f4afd9f340

Change-Id: I20d70cc4028fa9011c4a0abca4333b2adcc09a29