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

Change-Id: I1a4de01fe23a03b42c052f23733d95e07135ab73