Merge "libmemtrack: avoid counting surfaceflinger buffers twice"