Merge "Add adbd_test to mts." am: d0854b3397

Change-Id: I5a6c747472a69cd80962e5681ce5b626ff88d879