Merge "Modify font metrics computation to match Android"