Merge "Convert e2fsprogs targets to soong." am: 6091a50d7a am: 19f945ac14 am: 006bf071cd
am: 0c0ecab090

Change-Id: I6e3cbfe0166194d57e88152939070b5b73d93d87