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

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63