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

Change-Id: I7cd8c4aeb9987e57b3a3cc89810a8d99eb658654