Update GSG tests. Eliminate Android builds for now. Not working.