Merge "Get Mac viewer working with SDL" into master-skia

https://skia.googlesource.com/skia/+/1ba1d372c2727db56021d0687825320b12d10d4e

Change-Id: Icde82c9cf9d3b41a1692d65d486cbe5898b10d43