Merge "ART: Don\'t attempt write flock if not zygote" am: 224b7f3
am: 0ce4ac5

* commit '0ce4ac5a1886315fd9da992bfeae82b595e75ae3':
  ART: Don't attempt write flock if not zygote

Change-Id: I1f07cfdb56c91884b1f4a23cd1fc4277f713429b