Merge "Revert "Revert "Support socket activation of adb server""" am: a449a1cfd7 am: 275f6c4404

Change-Id: I994b44933444867a3819ec66b7bddf9ab6c0ef69