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

Change-Id: I7fe9e0da26410f536da1c0ab0f2d03039168f479