Stop statically including legacy-android-test

Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
  and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
  affected package to ensure that the classes that were included by
  legacy-android-test are still available at runtime. That also adds a
  dependency on android.test.base and android.test.mock.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* hostsidetests/abioverride/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAbiOverrideTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/abioverride/app/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAbiOverrideTestApp at runtime.

* hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAccessSerialModern
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccessSerialModern at runtime.

* hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppAccessData
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppWithData results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDocumentProvider
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDocumentProvider at runtime.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsEphemeralTestsEphemeralApp1's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsEphemeralApp1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsImplicitApp results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsNormalApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsEphemeralTestsNormalApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsUserApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsUserAppTest results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsExternalStorageApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsInstrumentationAppDiffCert results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsMultiUserStorageApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsReadExternalStorageApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsReadExternalStorageApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitApp results in
    duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitApp's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffRevision
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffRevision's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffVersion
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffVersion's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffCert
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffCert's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageAppA results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageAppB results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageStatsApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp23
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp23
    targets SDK version 23 which provides all the classes at runtime.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionApp23's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp23 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp25
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp25
    targets SDK version 25 which provides all the classes at runtime.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionApp25's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp25 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp26
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp26
    targets SDK version 26 which provides all the classes at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp26 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUsePermissionAppLatest results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionAppLatest at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUsePermissionDiffCert results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWriteExternalStorageApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWriteExternalStorageApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeySetTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAccountCheckAuthApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsAccountCheckAuthApp
    targets SDK version 25 which provides all the classes at runtime.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccountCheckAuthApp at runtime.

* hostsidetests/devicepolicy/app/AccountManagement/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccountManagementDevicePolicyApp results in duplicate classes
    which leads to build time and compile time issues.

* hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccountManagementDevicePolicyApp at runtime.

* hostsidetests/devicepolicy/app/Assistant/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDevicePolicyAssistApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDevicePolicyAssistApp at runtime.

* hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsCrossProfileAppsTests results in duplicate classes which leads
    to build time and compile time issues. It is also unnecessary as
    CtsCrossProfileAppsTests targets SDK version 25 which provides all
    the classes at runtime.

* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCustomizationApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsCustomizationApp at runtime.

* hostsidetests/devicepolicy/app/DelegateApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDelegateApp results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceAdminApp23
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsDeviceAdminApp23 targets
    SDK version 23 which provides all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp23's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceAdminApp24
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsDeviceAdminApp24 targets
    SDK version 24 which provides all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp24's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceOwnerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIntentReceiverApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/IntentSender/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIntentSenderApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/LauncherTests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLauncherAppsTests
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsLauncherAppsTests targets
    SDK version 25 which provides all the classes at runtime.

* hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsManagedProfileApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPackageInstallerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsProfileOwnerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDevicePolicySingleAdminTestApp results in duplicate classes
    which leads to build time and compile time issues.

* hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWifiConfigCreator
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/WifiConfigCreator/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsWifiConfigCreator at runtime.

* hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsProcStatsHelperApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsProcStatsHelperApp
    targets SDK version 24 which provides all the classes at runtime.

* hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsProcStatsHelperApp at runtime.

* hostsidetests/media/app/MediaSessionTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsMediaSessionHostTestApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsMediaSessionHostTestApp at runtime.

* hostsidetests/numberblocking/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsHostsideNumberBlockingAppTest results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsStaticSharedLibConsumerApp1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsStaticSharedLibConsumerApp1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher1 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher2 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher2 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher3 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher3/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher3 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher4new results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher4new at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher4old results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher4old at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher2 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher2 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher3 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher3/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher3 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_nobackup results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_nobackup at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_nomanifest results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_nomanifest at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_wrongkey results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_wrongkey at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4old results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4old at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4old_nomanifest results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4old_nomanifest at runtime.

* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutMultiuserTest results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/multiuser/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutMultiuserTest at runtime.

* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutUpgradeVersion1 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutUpgradeVersion2 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/upgrade/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutUpgradeVersion1 at runtime.

* hostsidetests/ui/appA/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDeviceTaskSwitchingAppA results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/ui/appA/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDeviceTaskSwitchingAppA at runtime.

* hostsidetests/ui/appB/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDeviceTaskSwitchingAppB results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/ui/appB/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDeviceTaskSwitchingAppB at runtime.

* hostsidetests/usb/SerialTestApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsbSerialTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/JobScheduler/jobperm/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsJobSchedulerJobPerm
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/JobScheduler/jobperm/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsJobSchedulerJobPerm at runtime.

* tests/JobScheduler/shareduid/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsJobSchedulerSharedUid results in duplicate classes which leads
    to build time and compile time issues.

* tests/JobScheduler/shareduid/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsJobSchedulerSharedUid at runtime.

* tests/ProcessTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in ProcessTests results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/acceleration/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccelerationTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccelerationTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/accessibilityservice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccessibilityServiceTestCases results in duplicate classes which
    leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityServiceTestCases's source depends on its classes
    and because of these changes they are no longer present on the
    compilation path.

* tests/admin/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAdminApp results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/app/app/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAppTestStubs's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppTestStubs results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/app/app2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAppTestStubsDifferentUid results in duplicate classes which
    leads to build time and compile time issues.

* tests/app/app2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAppTestStubsDifferentUid at runtime.

* tests/backup/app/fullbackup/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsFullBackupApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/backup/app/fullbackup/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to CtsFullBackupApp
    at runtime.

* tests/backup/app/keyvalue/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeyValueBackupApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/backup/app/keyvalue/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsKeyValueBackupApp at runtime.

* tests/fragment/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsFragmentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/framework/base/windowmanager/alertwindowservice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAlertWindowService
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/framework/base/windowmanager/alertwindowservice/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAlertWindowService at runtime.

* tests/jank/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsJankDeviceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsJankDeviceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/leanbackjank/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsLeanbackJankTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLeanbackJankTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/leanbackjank/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLeanbackJankApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsLeanbackJankApp targets
    SDK version 23 which provides all the classes at runtime.

* tests/leanbackjank/app/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsLeanbackJankApp at runtime.

* tests/netlegacy22.api/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetTestCasesLegacyApi22 results in duplicate classes which leads
    to build time and compile time issues.

* tests/netlegacy22.permission/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetTestCasesLegacyPermission22 results in duplicate classes
    which leads to build time and compile time issues.

* tests/pdf/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPdfTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/sample/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSampleDeviceTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSampleDeviceTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/accounts/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccountManagerTestCases results in duplicate classes which leads
    to build time and compile time issues. It is also unnecessary as
    CtsAccountManagerTestCases targets SDK version 26 which provides
    all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagerTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/animation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAnimationTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/app.usage/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsageStatsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' and 'android.test.runner' to
    LOCAL_JAVA_LIBRARIES because CtsUsageStatsTestCases's source
    depends on their classes and because of these changes they are no
    longer present on the compilation path.

* tests/tests/app/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAndroidAppTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAndroidAppTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/appwidget/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppWidgetTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAppWidgetTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/bluetooth/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsBluetoothTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/calendarcommon/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsCalendarcommon2TestCases results in duplicate classes which
    leads to build time and compile time issues. It is also unnecessary
    as CtsCalendarcommon2TestCases targets SDK version 15 which
    provides all the classes at runtime.

* tests/tests/car/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCarTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/carrierapi/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCarrierApiTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsCarrierApiTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/colormode/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsColorModeTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/content/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because CtsContentTestCases's source depends
    on their classes and because of these changes they are no longer
    present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsContentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/database/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDatabaseTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/display/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDisplayTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/dpi/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDpiTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/dreams/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDreamsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsDreamsTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/drm/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDrmTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/dynamic_linker/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDynamicLinkerTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/externalservice/service/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsExternalServiceService results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/externalservice/service/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsExternalServiceService at runtime.

* tests/tests/graphics/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsGraphicsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/hardware/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsHardwareTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsHardwareTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/incident/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIncidentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/keystore/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeystoreTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsKeystoreTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/libcorefileio/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsLibcoreFileIOTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLibcoreFileIOTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/location2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLocation2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLocation2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/media/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsMediaTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsMediaTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/net/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsNetTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsNetTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficFalseTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficTrueTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecConfigDownloadManagerTestCases results in duplicate
    classes which leads to build time and compile time issues.

* tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecConfigResourcesSrcTestCases results in duplicate classes
    which leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigResourcesSrcTestCases's source depends on its
    classes and because of these changes they are no longer present on
    the compilation path.

* tests/tests/opengl/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsOpenGLTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGLTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/os/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsOsTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsOsTestCases's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

* tests/tests/packageinstaller/adminpackageinstaller/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAdminPackageInstallerTestCases results in duplicate classes
    which leads to build time and compile time issues.

* tests/tests/permission/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPermissionTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsPermissionTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/permission2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPermission2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/preference/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreferenceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreferenceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/preference2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreference2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreference2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/renderscript/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsRenderscriptTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/rsblas/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsRsBlasTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/rscpp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsRsCppTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/sax/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSaxTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/security/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSecurityTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsSecurityTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/selinux/selinuxTargetSdk2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSelinuxTargetSdk2TestCases results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher1 results in duplicate classes which
    leads to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher2 results in duplicate classes which
    leads to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher3 results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerLauncher1 at runtime.

* tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher4 results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerLauncher4 at runtime.

* tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage1 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage2 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage3 results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerPackage1 at runtime.

* tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage4 results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerPackage4 at runtime.

* tests/tests/shortcutmanager/throttling/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerThrottlingTest results in duplicate classes which
    leads to build time and compile time issues. It is also unnecessary
    as CtsShortcutManagerThrottlingTest targets SDK version 25 which
    provides all the classes at runtime.

* tests/tests/shortcutmanager/throttling/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerThrottlingTest at runtime.

* tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSimpleperfDebugApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/slice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSliceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/speech/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSpeechTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsSpeechTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/systemintents/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSystemIntentTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/systemui/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSystemUiTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telecom/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelecomTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telecom2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelecomTestCases2
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telephony/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelephonyTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsTelephonyTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/telephony2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelephony2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsTelephony2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/theme/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsThemeDeviceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsThemeDeviceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/transition/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTransitionTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/uiautomation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUiAutomationTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/uidisolation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUidIsolationTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUidIsolationTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/uirendering/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUiRenderingTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/util/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUtilTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/view/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsViewTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsViewTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/widget/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWidgetTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/wrap/nowrap/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWrapNoWrapTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapNoWrapTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/wrap/wrap_debug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapDebugTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapDebugMallocDebugTestCases results in duplicate classes
    which leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugMallocDebugTestCases's source depends on its
    classes and because of these changes they are no longer present on
    the compilation path.

* tests/tests/wrap/wrap_nodebug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapNoDebugTestCases results in duplicate classes which
    leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapNoDebugTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/vr/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsVrTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVrTestCases's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

* tools/cts-holo-generation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsHoloGeneration
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHoloGeneration's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tools/cts-preconditions/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreconditions
    results in duplicate classes which leads to build time and compile
    time issues.

Bug: 30188076
Test: make checkbuild
Change-Id: I56c62344ab09338ed35586d76c0440d6f9515d72
203 files changed