Merge "Pass FontCollection to doLayout's argument instead of ctor"

        size_t bufSize) {

    minikin::MinikinPaint minikinPaint;

    minikin::FontStyle minikinStyle = prepareMinikinPaint(&minikinPaint, paint, typeface);

    minikin::Layout layout(Typeface::resolveDefault(typeface)->fFontCollection);

    layout.doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint);

    minikin::Layout layout;

    layout.doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint,

            Typeface::resolveDefault(typeface)->fFontCollection);

    return layout;

}