am 59175ac2: Merge change I81b1421a into eclair

Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-plus-aosp

* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.