Merge "Use AtomicDexRefMap for compiled classes" am: 187ff45768
am: 0054b91314

Change-Id: I66d070f0562ed8fdedcae90181721abdd9e412b0