Merge "Add VersionCodes.S"