[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: 82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours

am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912

Change-Id: Iced108828ba31fc6cd2713fd37feacb2fe04ee81