am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit 'afc1b34aca91144c80dfa7a46f52874fd8df3a31':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.