Merge "Report non-primary dex files loads to PM"
am: f23ea2ca62

Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c