Merge "Add adbd apex e2e tests." am: b870ae10a1 am: e7bb397ebf

Change-Id: I9bab3540b0be3e88f21d672b9d230dfee06e5662