Merge "Build test_com.android.adbd.apex."