Fix EGLImage memory leak am: f8b0360298
am: 8714e02f6f

Change-Id: Ieaaaf8110cf48345d661389ef189454f3e3886dc