Merge "Clean up AtomicDexRefMap"
am: dbeacd6f16

Change-Id: I1eb92d90ec2079ffc2ceeb83e631187645709abc