Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev am: aec1fbeaa3
am: 30baf2affa

Change-Id: I55e33f2d6b4e536d93daac57ff543c1f0d4780e9