Android CTS 5.0 release 4
Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev
am: 779c726a7a

* commit '779c726a7a24ae169cefacf2aa91cc54139a96ec':
  Fixes associated with the tzdata 2015a update