Bug 1010088 - Use STAGE_DIR consistently on build process