Merge changes from topic "surfaceflinger-arc"

* changes:
  SF: Cleanups to use std::atomic/std::mutex
  SF: Allow SurfaceFlinger creation to be altered