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