Merge "Add make_ext4fs to all builds" into jb-mr1-dev