am dde4fc12: (-s ours) Version number for AOSP master - do not merge

* commit 'dde4fc127c3c18531a1da9d3c72d1467979b413a':
  Version number for AOSP master - do not merge