Merge "Moving adbd from rootdir to system/bin" am: 851d5b64 am: 03015901 am: 811eed78 -s ours am: d8ed2a32 -s ours Change-Id: Ibd6443ab040dbbbd8a0cdbc0ab23019abdd15ea1