Fixup from merge, and compile fix due to different skia version

Change-Id: I644c5148904893a2854207f4d566395d973d4aff
2 files changed