Merge "Avoid abort when calling pthread_mutex_destroy more than once."
am: a026108ec1

Change-Id: Iccb73ab145d37276a0ec6d0ee054c87d33acbcb2