Merge "Fix the types in the arm64 dynamic function dispatch." am: 01db121db5 am: 9c24db8b49 am: 23c0523157 am: 1d8908957b am: c0916a0936

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2595603

Change-Id: Id69e4d5820d544afde37ee3f9384412e134eead4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>