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

am skip reason: subject contains skip directive

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

Change-Id: Ic70531f599300f56ed8878687bf3b6e3556106af