Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib."