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

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