Revert "Merge pull request #24040 from yurenju/merge-build-apps-2"

This reverts commit 4c7473cce3910a8ac1de16f3255218cb1a9959c9, reversing
changes made to a5f97cdbddacbaea9031aa9f9f00ab74cbcb25fc.