Merge "Move DateFormat.zeroPad() back to upstream."