Merge "Set pkg name in some "leaf" CTS Manifests."
am: ad6ac75a1e

Change-Id: I94b09a4d5246bce108d0a7a6e956b01c54baff9c