Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

bfb2ce3e ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE()
937e6e41 UPSTREAM: security: selinux: allow per-file labeling for bpffs

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5c3546d9d9a2216f2f81a86e2824fa2de9a6bd8c