Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"