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

* commit '9196f5f2df7890100e8968983680e196e944bd05':
  Add a zygote 64/32 bit config.