Merge "Add symlinks for zipinfo(1)."
am: 050e9d15c5

Change-Id: I65375702a01ba2f92fb25eeb7ad2ba8cec15b44c