Merge "Media NDK files"