Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb