Oleg Titov authored Aug 26, 2020 and Leo committed Oct 06, 2020

Ref https://github.com/google/brotli/releases/tag/v1.0.9

(cherry picked from commit 91b817a8)
(cherry picked from commit 5967ccb2)
(cherry picked from commit 110c2240)