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