Merge "Update AndroidTest to work with apct-suite setup" into pi-dev