Avoid conflicts between default JDWP sync port and transport address. am: 25d0ba6c am: efbc9a1e
am: 9b44ccc0
* commit '9b44ccc0':
Avoid conflicts between default JDWP sync port and transport address.
Change-Id: I6e5f9f420a81874716468a6ccbd4d67b7d03da37