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

Change-Id: I4b001b6df53acc1da53da37b9f6ffb547dfb041c