script: make osx devs happy

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