Rename build flavors and remove pre hashing of DataSpec key values.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135682130

demo/build.gradle

@@ -38,15 +38,15 @@ android {
     }
     }
 
 
     productFlavors {
     productFlavors {
-        demo
-        demoExt
+        noExtensions
+        withExtensions
     }
     }
 }
 }
 
 
 dependencies {
 dependencies {
     compile project(':library')
     compile project(':library')
-    demoExtCompile project(path: ':extension-ffmpeg')
-    demoExtCompile project(path: ':extension-flac')
-    demoExtCompile project(path: ':extension-opus')
-    demoExtCompile project(path: ':extension-vp9')
+    withExtensionsCompile project(path: ':extension-ffmpeg')
+    withExtensionsCompile project(path: ':extension-flac')
+    withExtensionsCompile project(path: ':extension-opus')
+    withExtensionsCompile project(path: ':extension-vp9')
 }
 }