Merge "Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d am: 8a9e43f1bf am: 4740e015b9 am: 1dcfb7e085  -s ours" into oc-mr1-dev-plus-aosp
am: 7a0379b460  -s ours

Change-Id: Id865e36fa97587c735bac12b77d364faa5c37061