Merge "bionic libs test: clean up for gethostname test"