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

Change-Id: Ib16d92d1baa03e2e350e1e1dc6a6539fe839f8cf