Merge changes I101e5578,I157b6233

* changes:
  Init EGL only for HW-accelerated Activities
  Refactor graphics environment initialization