(Re-)Set version names for AOSP master - do not merge

Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
2 files changed