Merge "Use -Werror in external/libvorbis" am: 34ec9fbbf9
am: e623471c48

Change-Id: I282a571c538013d6eab29932368c1a517422162a