am e417ffa7: am 6bd6a830: Merge "ART: (Partially) fix lock aliasing"

* commit 'e417ffa7949dfcacb13785cb6d4cff1317b2c429':
  ART: (Partially) fix lock aliasing