Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread