Merge change 20172

* changes:
  Add back a few libraries for backward-compability with the donut skia