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

Change-Id: I5c30b9805219d516df9a438b87e28dc775d74557