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

* commit '5883b5ce6a658c8745126f93325324340f4688bb':
  bionic libc test: clean up test_static_cpp_mutex test