Merge "Update the header path for ext4_utils."
am: 5bc3ce85cf

Change-Id: I962e2c4b311ea93c12de8be26b7a228fae1b1b22