Merge "ARM64: Fix IsAdrpPatch()." am: 2e7fb6341e
am: 748a2ed2ce

Change-Id: I4d1819b1ced2d177ed434f623f53064ea62fc636