Merge "Use -Werror in external/aac"
am: f38aee2252

Change-Id: I65c18c6eb45de16da43e862068929e9a9695caf7