Merge "Report non-primary dex files loads to PM"