Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev
am: 52402901b3

Change-Id: I65921d1e49b099ecb010acd53d5310d5291fe23a