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

Change-Id: I10a8de9283a9af4870fba6e36b01bbe771c6686a