Reformat and remove STL reference from header

b/19148482

Reformmated according to Android C++ style guidelines.
Removed STL references in headers.

Change-Id: I6d82b8fe5ac868067b6d9ebe797125feb97e5641
diff --git a/rsScriptGroup2.h b/rsScriptGroup2.h
index d4a64a0..92a0f10 100644
--- a/rsScriptGroup2.h
+++ b/rsScriptGroup2.h
@@ -3,8 +3,7 @@
 
 #include "rsScriptGroupBase.h"
 
-#include <list>
-#include <string>
+#include "rsList.h"
 
 namespace android {
 namespace renderscript {
@@ -23,15 +22,15 @@
     */
     ScriptGroup2(Context* rsc, const char* cacheDir, Closure** closures,
                  size_t numClosures) :
-        ScriptGroupBase(rsc), mCacheDir(cacheDir),
-        mClosures(closures, closures + numClosures) {}
+        ScriptGroupBase(rsc), mClosures(closures, closures + numClosures),
+        mCacheDir(cacheDir) {}
     virtual ~ScriptGroup2() {}
 
     virtual SG_API_Version getApiVersion() const { return SG_V2; }
     virtual void execute(Context* rsc);
 
-    const std::string mCacheDir;
-    std::list<Closure*> mClosures;
+    List<Closure*> mClosures;
+    const char* mCacheDir;
 };
 
 }  // namespace renderscript