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

Change-Id: I8c503aefe82500bdf9a15996da86be2aef965b91