Remove Android-specific imports, see cb5915