Merge "SurfaceTexture.cpp: use proper nativehelper headers am: f5350109 am: a3ca9caf am: a8627159 am: 8ca301dc"