Merge "Finish font support for AAPT"