move related statics into classes and the make safe static singleton instances
of those clases.

We still have to have the additional mutex (now per singleton) on the
methods that return the buffered data, as it may be modified per
call

Change-Id: I5873ae8271f48a0ebf4b584c1734688b77cd1d42