Merge "Re-enable LZ4_compress_HC in image writer" am: 8926b780fd
am: ccbc6c373c

Change-Id: I33d7da28d2b62ee5aeb62c6993eed1fbe6772864