cleanup, add android 11 for testing