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