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

Change-Id: I3082933477a552ff5ad19dc5386ffb1258845e08