Merge "Restore DroidSansFallback to fonts.xml"