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

Change-Id: I56ac5f64230dac0b104032fadb9930ecc3c913f4