Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev