Extend UBO binding workaround to Android.

src/libANGLE/renderer/gl/WorkaroundsGL.h

@@ -115,7 +115,7 @@ struct WorkaroundsGL
 
     // Some drivers seem to forget about UBO bindings when loading program binaries. Work around
     // this by re-applying the bindings after the program binary is loaded.
-    // This only seems to affect AMD OpenGL drivers.
+    // This only seems to affect AMD OpenGL drivers, and some Android devices.
     // http://anglebug.com/1660
     bool reapplyUBOBindingsAfterLoadingBinaryProgram = false;
 };

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -959,6 +959,11 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
     workarounds->emulateAtan2Float = IsNvidia(vendor);
 
     workarounds->reapplyUBOBindingsAfterLoadingBinaryProgram = IsAMD(vendor);
+
+#if defined(ANGLE_PLATFORM_ANDROID)
+    // TODO(jmadill): Narrow workaround range for specific devices.
+    workarounds->reapplyUBOBindingsAfterLoadingBinaryProgram = true;
+#endif
 }
 
 }  // namespace nativegl_gl