Remove r from version

So we get just abcdef instead of rabcdef for revision hashes.
And reduce the size of the revision hash on the splash screen.

Change-Id: I18659e444f54f81e2e737da89759ddb8c3e571be
Merge "Remove r from version"