Merge "Build test_com.android.adbd.apex." am: 427006042c am: ee38372728 am: 2bac7bff47

Change-Id: Ib2ccc3f56597c0027db4027e70794223b25af5af