Merge "Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea  -s ours am: 9497f830a2 am: 0125118f84" into nyc-mr1-dev-plus-aosp