Merge "Fix textarget in s_glFramebufferTexture2D" am: fb10c9a118 am: 5525470d55

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2043285

Change-Id: Iabf6c33bc1430b942346497e7115b579202af3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>