Revert^2 "Removing unused surface transaction wrappers"

2460910c8c454bc2d3c9ae35bd32eeb590851788

Change-Id: I076a7178c73e3bd86e3e62f562bc89398e6df4e9
2 files changed