Merge "Handle new zygote flags in ART"
am: e1fe6a98d4

Change-Id: I92fbfa89d45f465376d37e57f11f27a6e23ba613