Changed adb start cmd line construction to be more flexible.