Code Cleanup and better Sampler creation method

Change-Id: I9e35081ee6034cb619f43a47f8f22f38977f5d12
diff --git a/rs.spec b/rs.spec
index 0c4e1ed..5370e25 100644
--- a/rs.spec
+++ b/rs.spec
@@ -250,24 +250,15 @@
 	param uint32_t dimY
 	}
 
-SamplerBegin {
-	}
-
-SamplerSet {
-	param RsSamplerParam p
-	param RsSamplerValue value
-	}
-
-SamplerSet2 {
-	param RsSamplerParam p
-	param float value
-	}
-
 SamplerCreate {
-	ret RsSampler
-	}
-
-
+    param RsSamplerValue magFilter
+    param RsSamplerValue minFilter
+    param RsSamplerValue wrapS
+    param RsSamplerValue wrapT
+    param RsSamplerValue wrapR
+    param float mAniso
+    ret RsSampler
+}
 
 ScriptBindAllocation {
 	param RsScript vtm
@@ -275,13 +266,11 @@
 	param uint32_t slot
 	}
 
-
 ScriptSetTimeZone {
 	param RsScript s
 	param const char * timeZone
 	}
 
-
 ScriptInvoke {
 	param RsScript s
 	param uint32_t slot
@@ -293,7 +282,7 @@
 	param const void * data
 	}
 
-ScriptForEach { 
+ScriptForEach {
     param RsScript s
     param uint32_t slot
     param RsAllocation ain