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

* changes:
  Added new android.test.base targets
  Move legacy-test to test-base