Merge "Moving adbd from rootdir to system/bin" am: 851d5b64da
am: 03015901e3

Change-Id: I9d37f7b1b15b32e2f9b69bbddd30276611019924