Merge "Allow preopted apps to have sharpened calls for non-x86 architectures."