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

Change-Id: Ic532583ff8c04071f5ebdcc3532aed413f1d7e9f