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

Change-Id: If4496d0a134ad544ce69ea5391384e5b7637d5ad