Reviewed-by: alanb, dholmes, sherman
Summary: Close zipfile and io stream when done Reviewed-by: alanb
Reviewed-by: darcy, weijun
