Revert Revert PackageParser#Package fixes

To separate the changes from the massive commit that reverted the revert,
this commit includes any rebase/merge fixes since the original commit.

Change-Id: I556881a44068d38e6816f445d138f4b4e48d2df0
16 files changed