Merge "Revert "Add support for only starting 64 bit zygote.""