Merge "Revert "Support socket activation of adb server"" am: d4de7ad70e
am: c70a5e236c

Change-Id: Ia0c1998cb12921229d20e1d47c699f7b4fecad25