Merge "Reduce visibility on PackageDexUsage methods."