Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7