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

Change-Id: If112d7a595befc75f49cb1e988783016eb957dde