Merge "bionic libc test: clean up pthread mutex type test"