* Revert "Make host app test actually test host app (#24131)"

This reverts commit 27293857.

* Revert "Roll engine 5646e86a6f44..2584816d78a3 (2 commits) (#24197)"

This reverts commit 846a5eea.