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

Change-Id: I7eafbdddace6d7d36cbc92753c23f2252661f43f