Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Merge pull request #24040 from yurenju/merge-build-apps-2

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...