Merge "Fix EGLImage memory leak" into nyc-mr1-dev am: 02913603bd
am: 56d0ce45f3

Change-Id: I86f8f4ccd728917065ecedea46a2e067217e783f