Merge "Revert "Have the Surface class track the buffer age.""
am: 74074f158a

Change-Id: I33a545e19b203761cc4597ae0ebd7eb4e595f515