Add missing "typename". Rename type in macro.
Add missing "typename". Rename type in macro.

Missing typename is a bug, apparently missed by treehugger.

type T conflicts with an identically named template parameter in
SkRefSet.h.

Fixes a build break caused by ag/1461060 .

Change-Id: Ie695e760574dc3c84871cd23d57eb7852405ebc5

Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia