Merge "Remove unused mEglImageKHRContainer from NativeImageSource and add error check...