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

Change-Id: I71acb0b5d1fd99d6e84e3ac1164f0611cb7e7491