Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev