Merge "Regenerate encoders"
diff --git a/system/GLESv1_enc/gl_enc.cpp b/system/GLESv1_enc/gl_enc.cpp
index 79df3d7..31c1269 100644
--- a/system/GLESv1_enc/gl_enc.cpp
+++ b/system/GLESv1_enc/gl_enc.cpp
@@ -8,6 +8,8 @@
 #include "gl_enc.h"
 
 
+#include <vector>
+
 #include <stdio.h>
 
 namespace {
diff --git a/system/GLESv2_enc/gl2_enc.cpp b/system/GLESv2_enc/gl2_enc.cpp
index f42e7ba..ffffa49 100644
--- a/system/GLESv2_enc/gl2_enc.cpp
+++ b/system/GLESv2_enc/gl2_enc.cpp
@@ -8,6 +8,8 @@
 #include "gl2_enc.h"
 
 
+#include <vector>
+
 #include <stdio.h>
 
 namespace {
@@ -3028,8 +3030,7 @@
 	if (useChecksum) checksumCalculator->addBuffer(buf, ptr-buf);
 	if (useChecksum) checksumCalculator->writeChecksum(ptr, checksumSize); ptr += checksumSize;
 
-    // TODO: make this part of autogenerated pipe code.
-    // b/79208762
+	// TODO: emugen produces bad code here, see b/79208762
 	stream->readbackPixels(self, width, height, format, type, pixels);
 
 	if (useChecksum) checksumCalculator->addBuffer(pixels, __size_pixels);
diff --git a/system/renderControl_enc/renderControl_enc.cpp b/system/renderControl_enc/renderControl_enc.cpp
index e22d7c0..f250926 100644
--- a/system/renderControl_enc/renderControl_enc.cpp
+++ b/system/renderControl_enc/renderControl_enc.cpp
@@ -8,6 +8,8 @@
 #include "renderControl_enc.h"
 
 
+#include <vector>
+
 #include <stdio.h>
 
 namespace {