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

Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb