Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0
am: b93dc08bc6

Change-Id: I1b191e246349299a381ee5cec9bf15fad99bea5c