am 78b686d1: Merge "bionic libc tests: clean up test for static_init"

* commit '78b686d1e88e81f29c8cfc479115b356ca72f661':
  bionic libc tests: clean up test for static_init