am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit 'fbd80b58db2aa8f650acf26305e8cbed24a5755b':
  Adjust instruction sets for shared UID apps.