Merge "Add CTS test for FontFamily.Builder#addFont()." into sc-dev