Merge "configstore: should import ISurfaceFlingerConfigs"