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
am: a49249df8b

* commit 'a49249df8b7eace747c4a0240bcf21df771d6a61':

Change-Id: I7c006c2b5e17a21e221ade4d091aa3b64cb65e51