Merge "Add support for LZ4 compressed image files" am: 7cbd95c2fb
am: 3dafd53ff9

* commit '3dafd53ff90fc845c09b7206600ba9ff45e3fcbd':
  Add support for LZ4 compressed image files