Merge "Stubs/api check for legacy-test and android.test.runner"