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

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