am f1f4e334: Merge "bionic libc test: clean up test_static_cpp_mutex test"

* commit 'f1f4e33471a1b4e481cf443ff463bcd3c71b88be':
  bionic libc test: clean up test_static_cpp_mutex test