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

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