Merge "Revert "Support socket activation of adb server"" am: 6657c5d71f am: 0b8dc11215
am: b99a260cc1

Change-Id: Ia9e4e695d6b9809b9a21a60acda930354c48d873