Merge changes from topic 'skia_merge_1933880'

* changes:
  Fix HWUI tests to use android-only SkPaint flags
  Update framework to use new method for disabling DF path rendering.