Merge "ART: Disambiguate access-checks mode from lock-counting" into nyc-dev