Revert "Bug 964216 - follow-up: fix getEnv issue"

This reverts commit 5d9e0fb1e8fb9ce521026aea0d9f9af45526ff05.
Revert "Bug 964216 - Use build_stage to build keyboard app"

This reverts commit 7df9f588a3658d4579574aa574fec8e09744390e.
Merge pull request #15843 from comoyo/revert-964216

Revert Bug 964216