Merge "Move adbd from root to system" am: 3d6f85167e
am: f390f04381

Change-Id: I5916c9dc47c2560c0acbdc1b405e752e041d4bbe