Merge "Update a bunch of AndroidTest for apct suite" into pi-dev