Merge "Move adbd from root to system" am: 3d6f85167e am: f390f04381 am: 53aeb8af81  -s ours
am: 0768f03157  -s ours

Change-Id: I761544cc0369f4cd41352a41c522945bb0f51c88