GitLab

I'm going to be making extensive changes in these files so it's
convenient to apply clang-format up front so I can let it handle
formatting for the real work.

Also made them pass cpplint.py (except that cpplint wants me to name the
softkeymaster.h guard incorrectly).

Change-Id: I0f3717300c3536feabc38f0f0648aeb51bf77cee