Merge "libbinder_ndk_unit_test: unclear kExistingNonNdkService err"