am 0ce49783: am e25ed181: am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1

* commit '0ce49783083bf81cc1ea812e029fc94e1625a8fd':
  Ensure we have an EGL context when building layers Bug #5638421