Fix jumbo build in cc/paint after r556968.

Also rename globals from "g_foo_" to "g_foo" since they are not member
variables.

Bug: 815022, 788075
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I5ecee5b3559572dc2f700ad8ae8eb784fc298456
Reviewed-on: https://chromium-review.googlesource.com/1050872
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557091}
2 files changed