Merge "Remove mutex.h and its uses." am: 33414a8b5f
am: 88c992f080

Change-Id: I43b6a85801bcc7f444c36e49d427de5f4acecf71