Merge "Revert "Update layoutlib following Change Id10ca97f on FontFamily""