Merge "Support -c and -m for GTEST."
am: 85578a8515

Change-Id: I822e311442c27f47097bdecb39f1c1bb6bda476f