Merge "Use zip -q for adding shared libraries"