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