Merge "Update the header path for ext4_utils."
am: 6a18a6ddb5

Change-Id: I9f82c4f612ce5287b24e53ef151b886b91b0a0d7