Merge changes from topic "add-android.test.legacy"

* changes:
  Add android.test.legacy target
  Modify android.test.runner to use new mock APIs