Merge "Enable "localfilesystem" UNIX domain socket for ADB." am: 90e9217aca am: 0abe8e8126 am: 493a58efd0

Change-Id: Id26a621cf70754d8a7f37de3a8247812774e0c57