Merge "surfaceflinger: Set max acquired buffer count" am: af5c3b1d6a
am: e76d32d086

* commit 'e76d32d08656949399587251e761d7710b058e3a':
  surfaceflinger: Set max acquired buffer count