Merge "Refactored libstagefright_mediamuxer_fuzzer" into main