Merge "Disable strict abigail checking pending asm fix." am: 3e25f8272f am: 6e6e90fb9a

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

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