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

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