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