am 469cc57c: am 2f35d244: Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev

* commit '469cc57ca77687420246dd679e94eb242fcec41d':
  Avoid extraneous EGL surface allocations Bug #8667873