Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 am: 78b3889804 am: 9947e79b26
am: 5be781d874  -s ours

Change-Id: I301ce0b9995086f85f0653c4775a54997419b8fc