Switching to AndroidJUnitRunner instrumentation

Bug: 16864527
Change-Id: I8a79a78f24cbc52935743311f5f0dceeb780358f
2 files changed