Land #3373, recog

Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb

modules/exploits/android/browser/webview_addjavascriptinterface.rb

@@ -22,7 +22,8 @@ class Metasploit3 < Msf::Exploit::Remote
   |
 
   autopwn_info(
-    :os_flavor  => 'Android',
+    :os_name    => OperatingSystems::Match::ANDROID,
+    :arch       => ARCH_ARMLE,
     :javascript => true,
     :rank       => ExcellentRanking,
     :vuln_test  => VULN_CHECK_JS
@@ -73,7 +74,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'DefaultTarget'       => 0,
       'BrowserRequirements' => {
         :source     => 'script',
-        :os_flavor  => 'Android',
+        :os_name    => OperatingSystems::Match::ANDROID,
         :vuln_test  => VULN_CHECK_JS,
         :vuln_test_error => 'No vulnerable Java objects were found in this web context.'
       }