Merge "ART: Relayout BaseMutex and Mutex"