Merge "Make adbconnection validate jdwpOptions and change defaults"