Merge "Remove unnecessary <uses-library> for android.test.runner"