Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev