skia: more merge fixups

Change-Id: Ib8edfad4f4c4d9189eec7e15f31fd2c2163f5745