Merge "Simplify XZ compression." am: 03fc50104c am: 5b444ee7d2
am: d6f41c206c

Change-Id: I600edef24f6a3882f90befb84a636fae9e3fe49d