Merge "Use enum class for FontVariation and update MinikinUtils"