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

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

Change-Id: I31c9e8e1b4c039a0a9a0b5192997b2adc784ed42