Use Trebuchet package provider for scap

Change-Id: I754751fdcf6b2697270843b7c53b687033ad8578
Merge "Use Trebuchet package provider for scap" into production