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

Change-Id: I11e83217bea4327ef7e5d8b3c882f9bdfac0da09