am 51398646: Merge "ART: More lenient lock merging in the verifier"

* commit '51398646cfd6f8747c73c6c1cc65a0688613b19c':
  ART: More lenient lock merging in the verifier