Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
am: 51edfcf62b

Change-Id: I42813638e274ab7bc74122f25289c04815fc6b18