Merge "Update GrContext creation calls to use sk_sp"