Merge "Convert e2fsprogs targets to soong." am: 6091a50d7a
am: 19f945ac14

Change-Id: Ic9e7214abd359c24f33e273295584d174c701d0a