Merge "Remove repackaged.android.test... libraries"