Revert "lzo: This is a combination of 5 commits."

This reverts commit e1ed88e7e27f916ac4aff63c78059f89afc24bda.

Change-Id: Ibcdc45386bd1e01eee4bf5bd25e94c1b82171670