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

Change-Id: Ibaf3d0551fd08bd9d3a7f91a6fa2cfcf3488175f