Merge "Change #define to _BLKID_TYPES_H"
am: d1c2a81fbb

Change-Id: I51f0fd87a42750fd05279fd2c3938d4fdf06f817