Fix build

And clear out some other editor backup files
that got left behind.

Change-Id: I66cf2c45bde37c49d610bf3b5976cbff5d10e072