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

Change-Id: I6661ce9a1cea639782ddd15effc4bf6601d9db37