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

Change-Id: I2d18a61cf9b2b0439f98350668fe309d94809dce