Merge "Use libvendorsupport for vendor api level calculation" into main