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

* commit 'e006ea7920a36940c0e044333be56a5b1bb8de53':
  ART: Lock counting in the interpreter