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

* commit '8ed049de7c7762cfaf29148cb68b574312870dc9':
  bionic libc tests: clean up setting for hello_world.cpp