Merge "Mark e2fs libs vendor_available." am: e653ff4eaf
am: 88cef96f45

Change-Id: Iecd2b721cbe30f2a756ca8d3a98cfde7a55ac222