am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."

* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
  Fix version returned by eglInitialize from 4.1 to 1.4.