Merge "releasetools: Use pattern filter when unzipping." am: 76f038a63c
am: e2309ba525

Change-Id: Ide81c0015c4b840140f35311cc3195c61babd9c2