Fix merge derps
Revert "SurfaceFlinger: try dropping features from EGL config query before giving up"

This reverts commit 166c783471674cf0a0d1dec53076af6f2a72e19b.