Merge "Add font type to AAPT2"