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

Sync up with android11-5.4 for the following commits:

ae78026f ANDROID: Update android/abi_gki_aarch64.xml
a6b9410e ANDROID: Update android/abi_gki_aarch64_goldfish
240f2f8f ANDROID: generate_initcall_order.pl: Use two dash long options for llvm-nm

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