Merge "libbinder_ndk_unit_test: avoid race" into main