Merge "android_media_MediaMuxer_setLocation: amended signature."