After merging into the Android tree, this file was not compiling.
It turns out that it was because SK_SUPPORT_GPU was not defined. When
built by GYP, SK_SUPPORT_GPU is defined by GYP. When built by the
Android framework, we depend on SkUserConfig.h, which is included by
other files, to set SK_SUPPORT_GPU. Moving the includes outside of
#if SK_SUPPORT_GPU ensures that the dependency chain defining
SK_SUPPORT_GPU is included, so this code gets compiled as expected.
R=egdaniel@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/228893003
git-svn-id: http://skia.googlecode.com/svn/trunk@14132 2bbb7eff-a529-9590-31e7-b0007b416f81
ef93d294ef