Merge "cancelBuffer() when bufferqueue-based block dies" into pi-dev
am: 241db4bd6f

Change-Id: Ibfcaa4ca20ef170736d50370940ec61da13af7e2
tree: 5dfd277647ebed78936cfc004917d21575134044
  1. codec2/
  2. media/
  3. Android.bp
  4. OWNERS