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

* commit '0f672c6aad22dde39a172ae0b5f0b76068008f30':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.