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

* commit '05f980d42d4926ab2130cdcf9e646eb610a7080b':
  Make zygotes aware of their supported ABIs.