Merge "ARM64: Remove duplicate helper for intrinsic locations."
am: 78e1e045db

Change-Id: I375ec651da01e1ef73e6d6a2794809d9e0af9de4