Merge "Change #define to _BLKID_TYPES_H" am: d1c2a81fbb am: 4db9ff0c5d

Change-Id: I4f10b989d0073c82b1cf19d56d6d59578c3624c9