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

Change-Id: Ia968a7244b351957c280276787181f4fff3dbd7c