[[ RefactorGraphics ]] Tweaks to make libskia compile on Android and Linux.