script: make osx devs happy

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