Merge "[automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours" into android11-tests-dev