Merge "Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d08788 am: 8a9e43f1 am: 4740e015 am: 1dcfb7e0 -s ours" into oc-mr1-dev-plus-aosp