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

* commit '726aff1955d7c143657e0ec333aaad8339a8a58b':
  bionic libc tests: clean up setting for hello_world.cpp