Merge "Update the header path for ext4_utils." am: 6a18a6ddb5 am: 4759d1d637 am: e85d4467f5
am: 985d0805e7

Change-Id: I53d2076c94124687788232029fcad83b4f79541b