Merge "bionic libc test: clean up test_static_cpp_mutex test"