Merge "Incorporate upstream's strptime %Z/%z support."