script: make osx devs happy

Change-Id: I9006452d0325ab8836452db82f8e591e27359611
Merge remote-tracking branch 'cm/cm-11.0' into HEAD