am 5cc74cb6: am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev

* commit '5cc74cb64f20d106e9214cbfd0daabf364ed5249':
  Set default buffer size for SurfaceTexture.