Merge "Have the Surface class track the buffer age."
am: bbeb9fcf24

Change-Id: I99f47f24723ade4f19148ea9483d24cb716179ec