Merge "Add missing dependency on zip2zip"
am: 06c8df1ccd

Change-Id: If8631e6a9c20ef993916fa6c3f9eacffb4420d32