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

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