Merge "SurfaceTexture: detach from Dalvik when necessary."