Merge "Convert android.test.runner.stubs to Soong"
am: 6fa8d06c78

Change-Id: I35d8b4836e58092a2c9158c493af8653e7ffb021