Merge "Use -Werror in external/aac"