Convert to four space tabs

While I don't necessairly despise two spaces in Java, all of our other
projects use four.  This makes jumping between projects a pain with IDE
settings.

Change-Id: I841c28eb1cd3e04e77514bc284f5acb6d8b5b559