Merge "ART: Lock counting in the interpreter"