Merge change 7490

* changes:
  Fix master build errors post merge with master_gl branch.

libs/rs/rsContext.h

@@ -17,6 +17,8 @@
 #ifndef ANDROID_RS_CONTEXT_H
 #define ANDROID_RS_CONTEXT_H
 
+#include "rsUtils.h"
+
 #include <utils/Vector.h>
 #include <ui/Surface.h>
 

libs/rs/rsUtils.h

@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#include <EGL/egl.h>
+#include <math.h>
+
 #include "RenderScript.h"
 
 namespace android {