Merge "Properly remove adb DNS services." am: 7445a87101

Change-Id: I6412a3a8cc14a3ea9c3fb4fe1bd5a4be10a4aab0