Improve zipball dependencies

Change-Id: I3088f734db5e08afdd1c774420a463f627d75124