am fa52e645: (-s ours) am 2fc439c6: (-s ours) Restore AOSP-style version numbers - DO NOT MERGE

* commit 'fa52e645fb4ec7518c5493f44636df92612ff782':
  Restore AOSP-style version numbers - DO NOT MERGE