am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs."

* commit '9f777008eaead3cb9cee80d0c00e5a3d55de9de7':
  Make zygotes aware of their supported ABIs.