Merge "Enable thread annotations for std::mutex"
am: 7b220d60e3

Change-Id: If1677609eb3057d0823d51823ca5f954916635ba