Merge "Simplify XZ compression."
am: 03fc50104c

Change-Id: I6ccf42ffb12714cfbd901a3cca3fc43d71c953c5