script: make osx devs happy

Change-Id: I85eddc9232c1062f11a10617962a14e6a00318e7
Merge branch 'cm' into HEAD