Merge "[recipes] Smush the rest of builder_spec into appropriate places, other cleanup" into master-skia

https://skia.googlesource.com/skia/+/dfa55f2db436535cfa22abeb542270ef54b77675

Change-Id: I852f93355bd833fbd467d8af83802f58ef0a88d0