Merge "softkeymaster: do not use GNU old-style field designators"