Add more generic auto-discovery for statics

Change-Id: I4d20d6f126ec4698bbdae34c8476fe325363bced
2 files changed