Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d am: 8a9e43f1bf am: 4740e015b9
am: 1dcfb7e085  -s ours

Change-Id: I5ed356579bb814dcea6bcd5411964a98a7d7b1d2