Merge "Clean up ClassPathPackageInfoSource"
am: 8c7026c5a3

Change-Id: I503ae16c4d47ce3cecb79987da919c7f579347da