Merge "Fix update_ndk_abi.sh to work in CI." into main