Snap for 8522600 from 5f8ac321a80c12345f9b5f338507b54433da9a41 to tm-release
Snap for 8522600 from 5f8ac321a80c12345f9b5f338507b54433da9a41 to tm-release

Change-Id: Ibe7b8baf7aa7db89d8f1bad3259a086443a9a863

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,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