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

* commit '564abd1642fc3584a82d2737d053f9a50c5d0cae':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.