Merge changes from topics "timezone-2018h-i-fix-morocco", "timezone-2018h-i-straight-patch"

* changes:
  Fix Morocco to use rearguard format correctly in ICU.
  Update Android ICU tzdata from 2018g to 2018i.