am 2b507935: (-s ours) merge from open-source master - DO NOT MERGE

Merge commit '2b5079353b57615e8ec9826a685453174d9c0f36'

* commit '2b5079353b57615e8ec9826a685453174d9c0f36':
  Update platform version strings for AOSP