Merge "Add adbd_test to mts." am: d0854b3397 am: 80183a10cd am: ed60f2a2c6

Change-Id: Iaff793761dbfbe74df84cb9b7627ec33e1b6e776