Another attempt to fix the build.

With some logging around the new keyboard test failures.