Merge "add component metadata to all CTS module configs" into oc-dev am: 43596249b5
am: 55d3388eb4  -s ours

Change-Id: I08c7a1739acb7427391cff630b2fdbdec071cf1d