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

Change-Id: I81803b5609a27620050c5264a6558f132d017389