Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" build failure

This reverts commit c965501afb3849cb1b10b0738c86fe9e450e8b9a.