Merge "Fix ext4_util logging" am: c9ff61e5f4
am: 581b45e474

Change-Id: I64f9b87d955aceb1cacdd29dfc01c13a6658cf3c