Fix JUnitParamsRunner so it works with CTS sharding am: b03560c3 am: 2f41cd20 am: f5852119 am: 55edd63f am: c27747cb am: 3422818d Change-Id: I7e0837f5b98260b4fde44ee4dfca9a971e40964c