tweaks for ubuntu 18.04 compat

Change-Id: I23bb17d38c32df194a25e080ad507c9fdafe01fe
Reviewed-on: https://skia-review.googlesource.com/c/177009
Reviewed-by: Mike Klein <mtklein@google.com>
3 files changed