Merge "Add legacy-android-test target containing android.test classes"