Merge "CDD: Correction to build parameters BASE_OS & SECURITY_PATCH."