Merge "Fix the bspatch failure on an empty brotli stream"