Merge "Add adbd_test to mts." am: 977c30051a am: 6e42f916c9 am: 015811e1b4

Change-Id: Iaff793761dbfbe74df84cb9b7627ec33e1b6e776