Merge "Fix the types in the arm64 dynamic function dispatch." am: 01db121db5

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

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