Merge "Remove unused enum value and member of GrGpuObject" into master-skia

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

Change-Id: Ib7cd7d8781ac48949a315fc7f0674c3990b48a19