DO NOT MERGE - Merge ab/7272582 am: 12e8feff97 am: 3c564e730e

Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1735933

Change-Id: I2e100ec93589c9489a89ae81ea6c75a3e9c5dabb