Merge "Use -Werror in external/opencv"