Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."