Merge "Show amount of parallelism in gtest output." am: 15ae549658
am: 34637a7865

Change-Id: If0fb9136142357eaf6bfad0eba79e1ab06dc038c