Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548 am: bcc419edad am: 18b1a9901e
am: 502231b6be

Change-Id: Iaa54dec68b517225ad407c878743cb750123926b