Merge "sk_tool_utils_flags.cpp depends on GetResourcePath" into master-skia

https://skia.googlesource.com/skia/+/ada972d

Change-Id: I2deca2fb08f39b382e5d0ef6377039c924f95416