Merge "bionic libc test: clean up test for dlopen_null"