am 43b1bb5b: (-s ours) (Re-)Set version names for AOSP master - do not merge

* commit '43b1bb5be1e43ad8d430540e395c2216ace6c2a4':
  (Re-)Set version names for AOSP master - do not merge