Merge "Make brotli available to adb." am: a20fabc529 am: a788d3c600

Change-Id: I117bbcbfea8efff1a5a367cbe2063ff79ac8797b