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

* commit '6bd6a830f24033830a910f88928b400a7ed28418':
  ART: (Partially) fix lock aliasing