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

Change-Id: I5f862edbdbc3b9c0e09113a9acff26773ceebb87