Always use short version for kernel formatting and remove +

Change-Id: I675daad0acd0de668f2413a08c5b47f9c20c6d95
g2: update version

Change-Id: Icfa351b31ccf5459be21269f5bf5adb4fb48a590