Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  [DO NOT MERGE] Change #define to _BLKID_TYPES_H

Change-Id: Ia4b41a28c45f4915bb356987ab1657ec7ab2dd28