am 56bcf675: (-s ours) am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."

* commit '56bcf675976af65353b848bcfa34d671fa65d4ed':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.