Merge "Revert "releasetools: Use pattern filter when unzipping."" am: 0c3e31c69b
am: 6c98ad6c4e

Change-Id: Ide956c794dee147ff5f6cfa6e8afc06f3c8b49a1