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

Change-Id: I0362516cef1cec820d9d757f3e66a9252a24dc56