Merge "e2fsprogs: Fix macOS build." am: 8e814b82f3
am: 24793daef2

Change-Id: I6f38593959f320d75f58c66dfd0057ebb80c26ae