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

Change-Id: I4ad12c36885b8fc96efdba8cfc3247e512ac0018