Merge changes from topic 'ext4_utils_header'
am: 4ab6af6787

Change-Id: I76c462b9694e54240cf60ef4c05f124efec91ca1