Merge "Match LZMA SDK 18.05 API." am: 3607fe672a
am: b4403da532

Change-Id: Iec42d40eebc4e00a58d29ddb3976ac0fe129be11