Merge "libbinder_ndk_unit_test: fix after light install" into main