Revert "Merge pull request #23029 from yurenju/app-makefile-3"

This reverts commit 7855a89bc5e17ecc62e377b1bb7aab83ce881bc3, reversing
changes made to 193e46e885a53adefd0346725b3fc9b13e2dacae.