Merge "stagefright: MediaCodec: rename mNativeWindow to mSurface" into mnc-dev