Merge "Stop recording unsupported class loaders." am: c90f30d1d9 am: ad370ddf38
am: e9b09f2bc8

Change-Id: I2dfe1829fd900e48242089625e296566625d5378