Merge "Fix SDK: don't generate empty codename line in source.properties."