always use short version for kernel formatting

Change-Id: I01c941c553a6dcb1d33013445576ba2d2409afd8
scripts: get rid of the + sign at the local version

Change-Id: Ib9dded58a1adf3ab9b386571aff8fffd8fb02da4
Merge "always use short version for kernel formatting" into android-4.4
Merge "scripts: get rid of the + sign at the local version" into android-4.4