Merge changes from topic 'skia_merge'

* changes:
  Adding changes required by the master-skia merge.
  use SkBlendMode