Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"