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