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

Change-Id: Ibfcaa4ca20ef170736d50370940ec61da13af7e2