Merge "Suppress warnings in external/opencv"