Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev