Revert "instumentTest was renamed to androidTest"

This reverts commit a228440eb308ab068f9e057a05f6f4cf063ab048.