Merge "Handle new zygote flags in ART"