Merge "Revert "Mark e2fs libs vendor_available."" am: c91060c119
am: 877324d98b

Change-Id: I873ac41fd7e2b964b8cdf5cab83acbe377df5681