Fix various packager issues. Prepare changes for upstream.

BUG=none
TEST=Ran packager.

Change-Id: If3349a17f5278100f72afe9f1511e4332b8a346d
Reviewed-on: http://gerrit.chromium.org/gerrit/3701
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Tested-by: Dale Curtis <dalecurtis@chromium.org>
3 files changed