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

Change-Id: Ic9131a5bf07b30fc8f2986ecf3c7fa88823971f9