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

Change-Id: I6e464baf2dec2c360f7195d53bb389da3fd9a963