Merge "Recreate SKPs in a single directory for trusted partners." into master-skia

https://skia.googlesource.com/skia/+/8870e94fe38dc2cd73e0603b5facc4af78b5be83

Change-Id: I1b7e1d8b79223c740f59a5cbb3f95caa55e6a205