Merge "adbd: Disable "adb root" by system property (2/3)" into ics
Conflicts:

	adb/services.c