Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: ad285d8a17
am: 72bb3341d9

Change-Id: I7ed286fa9a95f0b757f57b96dc552c13ee6bc56f