Merge "Address API Council Feedback to android.graphics.fonts.Font"