Merge "Enable thread annotations for std::mutex"