e0c688d7ee
This PS moves static dependencies unser a 'static' key to allow expansion to cover dynamic dependencies. Change-Id: Ia0e853564955e0fbbe5a9e91a8b8924c703b1b02