Land #5583, Android Meterpreter commands fix

lib/msf/base/sessions/meterpreter_android.rb

@@ -19,6 +19,13 @@ class Meterpreter_Java_Android < Msf::Sessions::Meterpreter_Java_Java
     self.platform = 'java/android'
   end
 
+  def load_android
+    original = console.disable_output
+    console.disable_output = true
+    console.run_single('load android')
+    console.disable_output = original
+  end
+
 end
 
 end

lib/msf/base/sessions/meterpreter_options.rb

@@ -65,6 +65,12 @@ module MeterpreterOptions
         end
       end
 
+      if session.platform =~ /android/i
+        if datastore['AutoLoadAndroid']
+          session.load_android
+        end
+      end
+
       [ 'InitialAutoRunScript', 'AutoRunScript' ].each do |key|
         if (datastore[key].empty? == false)
           args = Shellwords.shellwords( datastore[key] )