Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master