Merge "CDD: Add BASE_OS and SECURITY_PATCH build parameters" into mnc-dev