Don't add components that are disabled.

Change-Id: I7163186143b930d47e26d4e748cb74e408860302
Merge "Don't add components that are disabled." into cm-11.0