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

* commit 'ec93e762afc46534aadb3f583dbf87e38e85bfe9':
  SurfaceFlinger: make the num FBs a board config