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

Change-Id: Ibc6476c5dbebb0228e021f17c1458585ab9e791d