Merge "Update Typeface.createFromFile/Asset"