Restore AOSP-style version numbers - DO NOT MERGE

Change-Id: I2c81a4dacc13e4705388c3d359410c81999d7b95
1 file changed