Merge "Move adbd from root to system"
am: 5fe1b661bb

Change-Id: I3b89a7a8e98252319f850a225ef7ba2080e54879