am e6e7947c: Merge "Add 1.7 methods to TimeZone / SimpleTimeZone"

* commit 'e6e7947cef6e6299d617b8efbe108d1c89a8f91d':
  Add 1.7 methods to TimeZone / SimpleTimeZone