Merge "Update AndroidTest to work with apct-suite setup" into pi-dev am: bc4b1b84e7
am: deae234b24

Change-Id: I59b81c988248e54b301134def569b9c36fad1c42