Adjust InstrumentationTest to skip empty test runs.

Tweak test timeouts to attempt to fix hanging issues.

Change-Id: Ibe5f4e6fdd98867dc148c6e1f98bf1b32aa058a4
3 files changed