am 1d265716: am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."

* commit '1d265716954122f79d5fdd9d953a98e303d298c9':
  Improve ABI handling for shared user ids.