Merge "Run EglConfigTest in a Single Activity"