Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"