Merge "Include some warnings about vendor_available for fsmgr."
am: cecf5480fe

Change-Id: Ifab05b718385c85d1b5378c46cde11cf5d950dc3