am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb

* commit 'a7393dd66f0127c8acdd5f8928b0c2d0de602275':
  Fix error reporting in Surface::cancelBuffer()