Merge "ndk: AMediaMuxer_addTrack to translate error only for negative values"