Merge "[inc] Test vendor API level instead of system for IncFS version" into sc-dev