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

Change-Id: Ia0c1998cb12921229d20e1d47c699f7b4fecad25