This reverts commit 2fe987e6bacea8884a397041c13a38e8ba97c2d6. Broke the Android buildbots. Turns out a couple more tweaks are necessary to turn them back on.
This reverts commit 2fe987e6bacea8884a397041c13a38e8ba97c2d6. Broke the Android buildbots. Turns out a couple more tweaks are necessary to turn them back on.