am f064f9df: am 64da6f04: Merge "stagefright: MediaCodec: rename mNativeWindow...
am f064f9df: am 64da6f04: Merge "stagefright: MediaCodec: rename mNativeWindow to mSurface" into mnc-dev
* commit 'f064f9df':
stagefright: MediaCodec: rename mNativeWindow to mSurface