Merge "Use -Werror in external/opencv" am: 28459d52af Change-Id: I32c0d31f37b10d36db2fd0f2912587da96e42e54