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

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