Removed proxy_pipeline, in favor of just having enabled features.

Change-Id: I660c24e4800cb837505dd8559334ee4174ca7286
Merge "Removed proxy_pipeline, in favor of just having enabled features."