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

Change-Id: I4d5de7f790db96009543599793ee429ec125cf79