Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-dev