Merge "bionic libc tests: clean up setting for hello_world.cpp"