Merge changes from topic "fix-legacy-android-test-spam"

* changes:
  Use new repackaged.android.test.base target
  Rename legacy-test related files to android-test-base