[bug 913382] More path fixing.

Also removed accidentally tracked content under static.