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

Change-Id: Ic466c3d7824e07510432ffb1f8b8522c736f8e29