Merge "Fix brotli decompressor interface usage when reading past the end." am: a65e5485c9
am: 48d4e28696

Change-Id: Ied60f019836327b3c1fe349434420cbfb760820c