Merge "Use -Werror in external/opencv" am: 28459d52af am: ba9cf7de2d
am: a1ded1f5ff

Change-Id: I46fb257a88d786a85e8e2f2fc82109fbc21feca6