Merge "ART: Extend Object tag table to be explicitly lockable"
am: 689a331ade

Change-Id: Ia9b74f2c81a9e3af8b2f389ff4d03640550577b2