Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_external_gptfdisk into leaf-3.1

Change-Id: I9838b127ae60f7b5fbdbaf42076a6076feb3f83d