Merge timwr's changes for autoloading android

Author: OJ

lib/msf/base/sessions/meterpreter_options.rb

@@ -67,9 +67,7 @@ def on_session(session)
       end
 
       if session.platform == 'android'
-        if datastore['AutoLoadAndroid']
-          session.load_android
-        end
+        session.load_android
       end
 
       [ 'InitialAutoRunScript', 'AutoRunScript' ].each do |key|

lib/msf/core/exploit/browser_autopwn2.rb

@@ -323,7 +323,7 @@ def start_payload_listeners
         multi_handler.datastore['PAYLOAD']              = payload_name
         multi_handler.datastore['LPORT']                = wanted[:payload_lport]
 
-        %w(DebugOptions AutoLoadAndroid PrependMigrate PrependMigrateProc
+        %w(DebugOptions PrependMigrate PrependMigrateProc
            InitialAutoRunScript AutoRunScript CAMPAIGN_ID HandlerSSLCert
            StagerVerifySSLCert PayloadUUIDTracking PayloadUUIDName
            IgnoreUnknownPayloads SessionRetryTotal SessionRetryWait

lib/msf/core/payload/android/meterpreter_loader.rb

@@ -28,10 +28,6 @@ def initialize(info={})
       'PayloadCompat' => {'Convention' => 'http https'},
       'Stage'         => {'Payload' => ''}
     ))
-
-    register_options([
-      OptBool.new('AutoLoadAndroid', [true, "Automatically load the Android extension", true])
-    ])
   end
 
   def stage_payload(opts={})

modules/payloads/singles/android/meterpreter_reverse_http.rb

@@ -35,9 +35,6 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_Java_Android,
       'Payload'     => '',
       ))
-    register_options([
-      OptBool.new('AutoLoadAndroid', [true, "Automatically load the Android extension", true])
-    ], self.class)
   end
 
   #

modules/payloads/singles/android/meterpreter_reverse_tcp.rb

@@ -30,9 +30,6 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_Java_Android,
       'Payload'     => '',
     ))
-    register_options([
-      OptBool.new('AutoLoadAndroid', [true, "Automatically load the Android extension", true])
-    ], self.class)
   end
 
   #