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

Change-Id: I5f24e0e8a5b4c592e60e749df66df3908d1620f5