Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev