am b049d1ab: am e74493cb: Merge "ART: Special form of lock aliasing"

* commit 'b049d1ab2e17b7b349a322f63e0944c13e92f9ae':
  ART: Special form of lock aliasing