am a2c1261e: (-s ours) Set version numbers for AOSP - do not merge

* commit 'a2c1261e719b4fbac9eee4e348b629360870468f':
  Set version numbers for AOSP - do not merge