Revert "add guard for recent api change"
Revert "add guard for recent api change"

This reverts commit 1c8bb8a4c63c327fb856a41e1b0b19775eac0ac1.

Reason for revert: google3 now updated

Original change's description:
> add guard for recent api change
> 
> Bug: skia:
> Change-Id: Ief80e0eb08d091c54cacb045d074c8564adcedba
> Reviewed-on: https://skia-review.googlesource.com/22640
> Commit-Queue: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>
> Reviewed-by: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>

TBR=benjaminwagner@google.com,f5cabf8735907151a446812c9875d6c0c712d847@google.com

Change-Id: If534fa0f508b5087e3e7527f822906626fdb65c0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/23002
Reviewed-by: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>
Commit-Queue: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>

Hikari-no-Tenshi/android_external_skia,HalCanary/skia-hc,rubenvb/skia,google/skia,HalCanary/skia-hc,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,HalCanary/skia-hc,google/skia,HalCanary/skia-hc,google/skia,aosp-mirror/platform_external_skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,rubenvb/skia,aosp-mirror/platform_external_skia,HalCanary/skia-hc,google/skia,rubenvb/skia,google/skia,rubenvb/skia,aosp-mirror/platform_external_skia,rubenvb/skia,HalCanary/skia-hc,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,google/skia,google/skia,HalCanary/skia-hc,aosp-mirror/platform_external_skia,HalCanary/skia-hc,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,google/skia,aosp-mirror/platform_external_skia,HalCanary/skia-hc,google/skia,rubenvb/skia,HalCanary/skia-hc,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,aosp-mirror/platform_external_skia,google/skia