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

Change-Id: I2eec348edcdfaeb92dd1930f6d28f7601a5fb736