Merge "Make mixed samples contingent on auxiliary extensions" into master-skia

https://skia.googlesource.com/skia/+/0edea2c8e76a9f5340a7a4960193757c4a5fb227

Change-Id: I8c2edf51395dc11bd0d472e08ef46917f8f89db7