Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo