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

Change-Id: I593f46bad6a3214d7a21f3581ea43c78843949ef