Merge "Build dex2oat as 64b for the target when using zygote64"