Merge "configstore: remove build flags from surfaceflinger"