Merge "Make adbconnection validate jdwpOptions and change defaults"
am: bf9eedaac5

Change-Id: Iff032c88fb437aec239f6b63dc7cc249ffba1161