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

* commit 'fbab3b67afc904450613204400d9e8779feb5659':
  Fix a bug in SurfaceTexture::setBufferCount.