Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_external_skia into universe

Change-Id: I6437837a03d361953d39dd25b616060e14e1d099