Merge changes from topic 'ext4_utils_header' am: 4ab6af6787 am: 83561b8869 am: c4f589729b
am: 1fc04457bd

Change-Id: Ia4da8d4a6dbcd9f08ababd2d33313c6fbf07a05a