Merge "surfaceflinger: Set max acquired buffer count" am: af5c3b1d6a am: e76d32d086
am: 5732481aab  -s ours

* commit '5732481aabbf2fd077756abd1d395c3a6c271ad9':
  surfaceflinger: Set max acquired buffer count