Merge "Bug 3330205 Thread safe strptime implementation"