Merge "ext4_utils: disable ext4 64bit block support" am: 72f6658f3a
am: 8cba8ecd77

Change-Id: I733fef5a91c23141fb61d40f726ac15932e052e3