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