Merge "Fix possible issue with cfi_basic test." into android10-tests-dev