Merge "Make bionic gtest main be compatible with gtest output format for cts test."