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

Change-Id: I301e3acd16ea46bc83806d75f376185f0bd2e150