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

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