Merge change 5045

* changes:
  remove deprecated use of porterduff