Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread