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

Change-Id: Ifd7812ff0acba03544a05a3fcea7721da8fe7d0f