Fixes needed to run Skia in debug mode

Change-Id: I420c812b34ba41a3fc03db1f1276340954d379c1
2 files changed