Merge changes from topic '2016f_stage-aosp-master' into stage-aosp-master

* changes:
  Update timezone data to 2016f
  Update timezone data to 2016e