Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1