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

* commit '41834dc226b4842eea3b296bc8acd22663ac3eb1':
  ART: Don't attempt write flock if not zygote

Change-Id: Ib939ab67aeb083f1cb2e964a2d77b917ad0fe05a