Merge "bionic libc test: clean up sysconf test"