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

Change-Id: Ie049eda219de7e7b709330c6481ab9ed03496fb1