am 7d9a0e64: Merge "Fix mutex_test.cc so it\'ll compile with both GCC versions...
am 7d9a0e64: Merge "Fix mutex_test.cc so it\'ll compile with both GCC versions we support." into ics-mr1-plus-art
* commit '7d9a0e64':
Fix mutex_test.cc so it'll compile with both GCC versions we support.