Use PNaCl in V2 builds of the remoting webapp

remoting/webapp/build-webapp.py

Index: remoting/webapp/build-webapp.py
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index df934f83b929701b5ec014b7efbaabe9c41eaa65..5b5d0e0c2260c0126b688280478dd19fff467399 100755
--- a/remoting/webapp/build-webapp.py
+++ b/remoting/webapp/build-webapp.py
@@ -86,7 +86,7 @@ def buildWebApp(buildtype, version, destination, zip_path,
     zipfile: A string with path to the zipfile to create containing the
              contents of |destination|.
     manifest_template: jinja2 template file for manifest.
-    webapp_type: webapp type ("v1", "v2" or "v2_pnacl").
+    webapp_type: webapp type ("v1" or "v2").
     files: An array of strings listing the paths for resources to include
            in this webapp.
     locales: An array of strings listing locales, which are copied, along
@@ -150,7 +150,7 @@ def buildWebApp(buildtype, version, destination, zip_path,
       raise Exception("Unknown extension: " + current_locale);
 
   # Set client plugin type.
-  client_plugin = 'pnacl' if webapp_type == 'v2_pnacl' else 'native'
+  client_plugin = 'pnacl' if webapp_type == 'v2' else 'native'
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'CLIENT_PLUGIN_TYPE'", "'" + client_plugin + "'")