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

Change-Id: I8151028f99c05f340aa491357811e05a875fed2d