Merge "ART: Update dalvik-cache for zygote after OTA"
am: c3214fbb66  -s ours

* commit 'c3214fbb66b5f4c436c44d027df5046c803f6432':
  ART: Update dalvik-cache for zygote after OTA