Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69

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

Change-Id: Ie89af84c17f67c94225f134a0e04204cd1e57d22