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

Change-Id: I9dceb9bb11962a608bd202ce6fdbdb65101dac6d