Merge "Have the Surface class track the buffer age." am: 56954aa36e
am: ffaa027835

Change-Id: I495c293175229dd7a6d658e171e1170a537831c1