Merge "Suppress warnings in external/skia."