Closes #40172 (closed).
This replaces !232 (closed).
I have been able to build all android bundles with this branch.