Merge "Revert "Mark e2fs libs vendor_available.""