Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT"