Merge "Add -Wthread-safety in libmediautils"