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

* commit '64dd64127714934548d0c09533a717f69ff9ec4a':
  bionic libc test: clean up test_static_cpp_mutex test