Merge "Match LZMA SDK 18.05 API."
am: 67ec53de4e

Change-Id: I9e5ddfe652960bb995ebaa286cd0074c19a49972