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

* commit 'c2872a62402c7e075a1f9cfba04c4e4d65c30c8f':
  Add make_ext4fs to all builds