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

Change-Id: Ic8e694a1e2a8a17cb47bb7fc050ad57416f75e10