Merge "Add 1.7 methods to TimeZone / SimpleTimeZone"