Merge "Revert "Add support for only starting 64 bit zygote."" am: 86cc51ae...

Merge "Revert "Add support for only starting 64 bit zygote."" am: 86cc51ae am: e6c462d2 am: e98aa451

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155013



Change-Id: I7284f9bb83f6bfad9f7c7384e3d940505e4d24f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>