Merge "Clean up ClassPathPackageInfoSource" am: 8c7026c5a3 am: 1c6a5ad92e
am: 88d54c3080

Change-Id: I3716fc728a6789a33851f4f0ad30a3ad9f421a17