Made adjustments to build with libskia