Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev