Merge "Have the Surface class track the buffer age." into oc-mr1-dev am: f0c9a391a5
am: 30fe3dc651

Change-Id: I008d5df3c6fddf82ae560da3bbb9c015c83ffd92