Merge "Build android.test.runner and its variants with SDK"