Merge branch 'adb_retry' of https://github.com/lukeis/selendroid into adb_retry

Conflicts:
	selendroid-standalone/src/main/java/io/selendroid/android/impl/DefaultAndroidEmulator.java
Merge branch 'adb_retry' of https://github.com/lukeis/selendroid into adb_retry