Merge "ART: Relayout BaseMutex and Mutex"
am: 97dc711074

Change-Id: Ibc24950d7a8fba3d1c516d5e004253fb34891531