Merge "AAPT: Add support for 'font' resource type"