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

Change-Id: I8ea923ce0bf80950006cacc703fe912714030c72