Merge "Refactored libstagefright_writer_fuzzer" into main