Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
am: 124acec8ad

Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af