script: make osx devs happy

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