Merge "Revert "[DexLoadReporter] Report classloader contexts directly f..."" am: ae50e15d59

Change-Id: Icc45c40ce116ce54a915650ca6f6600b6db08e0e