Merge "Enable "localfilesystem" UNIX domain socket for ADB." am: 8de1dcd19d am: 0abe8e8126

Change-Id: I5158baa4543e5d69ecf77fa63db77e61b8d39712