Merge \\"Suppress warnings in external/opencv\\" am: 37a00df8cc
am: d37fe1bc1a

Change-Id: If336834b989506a2788db5756d6bb8499f6e4f88