Merge "Add apis needed for android.test.legacy"