Merge "Fix incremental build number on Darwin" into cm-10.2