Merge changes from topic 'cfg_nsfbuf'

* changes:
  configstore: removing BoardConfig variables (NUM_FRAMEBUFFER_SURFACE_BUFFERS)
  configstore: use utility functions defined in ConfigStoreUtils.h

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
index d2dddba,b39692c..c21c816
--- 1/services/surfaceflinger/SurfaceFlinger.cpp
--- 2/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@@ -136,10 -124,12 +124,12 @@@ using namespace android::hardware::conf
  // the latency will end up being an additional vsync period, and animations
  // will hiccup.  Therefore, this latency should be tuned somewhat
  // conservatively (or at least with awareness of the trade-off being made).
- static int64_t vsyncPhaseOffsetNs = getVsyncEventPhaseOffsetNs();
+ static int64_t vsyncPhaseOffsetNs = getInt64<
+         ISurfaceFlingerConfigs,
+         &ISurfaceFlingerConfigs::vsyncEventPhaseOffsetNs>(1000000);
  
  // This is the phase offset at which SurfaceFlinger's composition runs.
 -static const int64_t sfVsyncPhaseOffsetNs = SF_VSYNC_EVENT_PHASE_OFFSET_NS;
 +static constexpr int64_t sfVsyncPhaseOffsetNs = SF_VSYNC_EVENT_PHASE_OFFSET_NS;
  
  // ---------------------------------------------------------------------------