Merge "Change gcstress runtest option"
am: 36bf3a2d28

Change-Id: I5e76005cbbfbeb659d5bc8455fd260131c5fffcd