Merge "libbinder_ndk_unit_test: wait slightly longer"