Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae am: 9c245a51f7
am: 499f1f39ff

Change-Id: I873b8c6239bb7766ac1a4b4078afb3700000186b