Merge "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp."" into lmp-dev