Merge "On the bots, there's no need to link GMs into SampleApp." into master-skia

https://skia.googlesource.com/skia/+/a7e930f

Change-Id: Iaad86ff8f36aea9078aeeae2995ddb0342000715