Restore AOSP-style version numbers - DO NOT MERGE
Restore AOSP-style version numbers - DO NOT MERGE

Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build