script: make osx devs happy

Change-Id: Ib58b678816dfb9b2dba85df0ffe3811d60fe7151
Merge remote-tracking branch 'cm/cm-12.0' into HEAD