Merge "ART: Add simple null alias tracking for lock counting"