Revert "AndroidTest"

This reverts commit e7cb7df8cf2b837873d57725b80694c7c0a07368.