Merge "IWYU for sk_malloc_throw"