am 2a5eea30: Merge change 27168 into eclair

Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp

* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
  Use EGLUtils to simplify choosing a configuration.