Merge "Add adbd_test to presubmit test mapping" am: 0064e9ca1a
am: 5b1a4e8515

Change-Id: If4652add483d5b3e4705154c2603bd62ae059bd8