Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev