Keep temp files in the output directory.

Also, make sure that the regenerated version gets
automatically added to the set of changed files.

Tested by rebuilding the tree and observing the
`git status' output.

Review URL: http://codereview.chromium.org/2809040
2 files changed