Merge "ART: Don't attempt write flock if not zygote" into nyc-dev