am 870a1b6d: am da458691: Merge "ART: Lock counting in the interpreter"

* commit '870a1b6d59791756d4123ba8de1067b8bd0ff352':
  ART: Lock counting in the interpreter