am f2eb160e: Merge "Revert "Allow preopted apps to have sharpened calls for non-x86 architectures.""

* commit 'f2eb160e685d544eda859e5df5e44b5b4c096760':
  Revert "Allow preopted apps to have sharpened calls for non-x86 architectures."