Merge "Build android.test.base/legacy against SDK"