Merge "Avoid running strip on modules if there is no modules directory." into gingerbread