Merge "Fix a case when brotli writer fails to write last few blocks of data" into oc-mr1-dev am: 92aef7fa88
am: d9c4ad1086

Change-Id: I425fd42c7ee4e1a2c37e5b8c1ce97df735d4f9ee