Merge "Use -Werror in external/libvpx"
am: decf1db5e6

Change-Id: If2e5f06ee17ea4b668b5e81918ca91203af98f00