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

* commit '7be06900a824babd17c5f4e018c08aeca9ba57e3':
  Make zygotes aware of their supported ABIs.