am 912067f5: am 69c37c3b: Merge "Revert "Revert "Allow preopted apps to have sharpened calls for non-x86 architectures."""

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