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

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