Set version numbers for AOSP - do not merge

Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
2 files changed