Merge "fastboot: remove reference of deprecated make_ext4 code" am: 525205508f
am: 2089237ee8

Change-Id: Ib6db9a825a0ff0419e93821ac7022cdfbee87edc