Revert "BufferQueue: simplify max buffer count handling"

This reverts commit e191e6c34829aec406a9cfe3e95211f884a311ff.

Conflicts:
	include/gui/BufferQueue.h
	libs/gui/BufferQueue.cpp

Change-Id: Iae1bd5198a19b891f95718b8fe4125b4283321bb
Revert "BufferQueue: clean up buffer counting"

This reverts commit 31a353da225af5329735451c761b430d82dfda1b.

Conflicts:
	libs/gui/BufferQueue.cpp
	services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

Change-Id: I8e12fe7915cf810be82757df8d4d7839892f584d