Merge changes from topics "2018g", "2018f"

* changes:
  Update Android tzdata from 2018f to 2018g
  Update Android tzdata from 2018e to 2018f