Merge "Match LZMA SDK 18.05 API."
am: b12c46f838

Change-Id: Ia0bc1a70b5a174a3e9d69241ecf023b579cda7c8