Merge "Support socket activation of adb server" am: d7052824d4
am: cd13e0f54e

Change-Id: Ia420507624d0acebfcc1348d47becc9963c37d56