adding reverse_https & reverse_http
back to api 3
try to connect again if failed
fixing ContactsContract issue
fixing SDK_INT issue
Merge remote-tracking branch 'origin/android-dev'

Conflicts:
	androidpayload/app/AndroidManifest.xml
	androidpayload/app/res/layout/main.xml
	androidpayload/app/src/com/metasploit/stage/MainActivity.java
	androidpayload/library/src/com/metasploit/meterpreter/AndroidMeterpreter.java
	androidpayload/library/src/com/metasploit/meterpreter/android/check_root_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/device_shutdown_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/dump_calllog_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/dump_contacts_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/dump_sms_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/geolocate_android.java
	androidpayload/library/src/com/metasploit/meterpreter/android/stdapi_sys_config_sysinfo_android.java