Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev