Restore AOSP-style version numbers - do not merge

Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
2 files changed