am 4e0e57d1: (-s ours) am 6e18c0ab: Merge "Allow preopted apps to have sharpened calls for non-x86 architectures." into lmp-mr1-dev

* commit '4e0e57d11cf8e20cba705959bd4a86a8e5b30bf2':
  Allow preopted apps to have sharpened calls for non-x86 architectures.