am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."

* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
  Add a zygote 64/32 bit config.