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