Merge "Incorporate upstream's strptime %Z/%z support." am: 159bb3f86b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1417572

Change-Id: Ic00db40d010c75b2384796c19751226bec5519fd