Merge "Move SkAvoidXferMode into frameworks/base."