Merge "bionic libc tests: clean up test for static_init"