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':
  Fix __cxa_atexit run-time regression with many registrations

Change-Id: I64a49765e674969d0b535bc3e2a204d081c2fe5b