Merge "Modify --min-sdk-version syntax in LegacyToolchain" into ub-jack